From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 27 Feb 2010 12:43:30 +0000 (-0500)
Subject: Merge frome mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5232^2~10
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d23cd5eeb2993e55943d250ea8c2015da5b06a24;p=emacs.git

Merge frome mainline.
---

d23cd5eeb2993e55943d250ea8c2015da5b06a24